From ac4241f8e2a8885760d6b41928e71a83944f76ea Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Wed, 18 Aug 2004 16:59:54 +0000 Subject: [PATCH] bitkeeper revision 1.1159.40.1 (41238b0aeIY1yNNg2yYui_jKDRtRPA) dom_mem_ops fixup --- linux-2.6.7-xen-sparse/drivers/xen/netfront/netfront.c | 2 +- xen/common/dom_mem_ops.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-2.6.7-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6.7-xen-sparse/drivers/xen/netfront/netfront.c index 118577ef3e..176cd90dc3 100644 --- a/linux-2.6.7-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6.7-xen-sparse/drivers/xen/netfront/netfront.c @@ -285,7 +285,7 @@ static void network_alloc_rx_buffers(struct net_device *dev) rx_mcl[nr_pfns].args[0] = MEMOP_decrease_reservation; rx_mcl[nr_pfns].args[1] = (unsigned long)rx_pfn_array; rx_mcl[nr_pfns].args[2] = (unsigned long)nr_pfns; - rx_mcl[nr_pfns].args[3] = 0; + rx_mcl[nr_pfns].args[3] = DOMID_SELF; /* Zap PTEs and give away pages in one big multicall. */ (void)HYPERVISOR_multicall(rx_mcl, nr_pfns+1); diff --git a/xen/common/dom_mem_ops.c b/xen/common/dom_mem_ops.c index e364a46a68..1f61c240fa 100644 --- a/xen/common/dom_mem_ops.c +++ b/xen/common/dom_mem_ops.c @@ -98,7 +98,7 @@ long do_dom_mem_op(unsigned int op, struct domain *d; long rc; - d = (domid == DOMID_SELF) ? current : find_domain_by_id(domid); + d = ( (domid == DOMID_SELF) || (!IS_PRIV(current)) ) ? current : find_domain_by_id(domid); if ( d == NULL ) return -ESRCH; -- 2.30.2